| commit | b551377cb5b53a9d5872eeaa46cd5b3a0a661435 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <gitster@pobox.com> | Mon Apr 22 03:38:39 2019 |
| committer | Junio C Hamano <gitster@pobox.com> | Mon Apr 22 03:38:39 2019 |
| tree | e9b56aec3e6abf5746d842678d8fa88b01472e8d | |
| parent | 6b7d215a58fcad73e1d989b5767c9d3b2ba6608b [diff] [blame] |
Autogenerated HTML docs for v2.21.0-498-g14c0f8
diff --git a/mergetools-diff.txt b/mergetools-diff.txt index 4b2148d..a80aa37 100644 --- a/mergetools-diff.txt +++ b/mergetools-diff.txt
@@ -17,6 +17,7 @@ * meld * opendiff * p4merge +* smerge * tkdiff * vimdiff * vimdiff2